From e1c10ecdf7f0a4437e631bdbf887ce4af4c03a1b Mon Sep 17 00:00:00 2001 From: Yi Sun Date: Thu, 31 Aug 2017 16:07:26 +0800 Subject: [PATCH] x86: remove redundant checks in sysctl.c MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit In sysctl.c, the return value of 'psr_get_info' has been checked immediately. So, it is redundant to check the return value again when copy the field to guest. Suggested-by: Roger Pau Monné Signed-off-by: Yi Sun Reviewed-by: Jan Beulich Reviewed-by: Roger Pau Monné --- xen/arch/x86/sysctl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/sysctl.c b/xen/arch/x86/sysctl.c index 2bde99c3c4..c3fdae81d1 100644 --- a/xen/arch/x86/sysctl.c +++ b/xen/arch/x86/sysctl.c @@ -190,7 +190,7 @@ long arch_do_sysctl( sysctl->u.psr_cat_op.u.cat_info.flags = data[PSR_INFO_IDX_CAT_FLAG]; - if ( !ret && __copy_field_to_guest(u_sysctl, sysctl, u.psr_cat_op) ) + if ( __copy_field_to_guest(u_sysctl, sysctl, u.psr_cat_op) ) ret = -EFAULT; break; } @@ -209,7 +209,7 @@ long arch_do_sysctl( sysctl->u.psr_cat_op.u.cat_info.flags = data[PSR_INFO_IDX_CAT_FLAG]; - if ( !ret && __copy_field_to_guest(u_sysctl, sysctl, u.psr_cat_op) ) + if ( __copy_field_to_guest(u_sysctl, sysctl, u.psr_cat_op) ) ret = -EFAULT; break; } -- 2.30.2